diff --git a/eclipse-format.xml b/eclipse-format.xml
index 0091840..b925a9f 100644
--- a/eclipse-format.xml
+++ b/eclipse-format.xml
@@ -1,827 +1,339 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- eclipse-formatter configuration for Samoa. Mostly same as eclipse built-in 
-	"java conventions" with the following differences: 1/ line wrap at 120 chars, 
-	2/ spaces-only indentation (no tabs) 3/ do not join lines (i.e. do not break 
-	line breaks added intentionally) The eclipse formatter can be invoked standalone 
-	(from the eclipse installation directory) with the following command: eclipse 
-	-nosplash -application org.eclipse.jdt.core.JavaCodeFormatter -config eclipse-format.xml 
-	<samoa-dir> There is also a plugin for intellij -->
+<!-- eclipse-formatter configuration for Samoa. Mostly same as eclipse built-in "java conventions" with the following differences: 
+  1/ line wrap at 120 chars, 2/ spaces-only indentation (no tabs) 3/ do not join lines (i.e. do not break line breaks added 
+  intentionally) The eclipse formatter can be invoked standalone (from the eclipse installation directory) with the following 
+  command: eclipse -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter -config eclipse-format.xml <samoa-dir> There 
+  is also a plugin for intellij -->
 
 <profiles version="1">
-	<profile kind="CodeFormatterProfile" name="samoa" version="1">
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.disabling_tag"
-			value="@formatter:off" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field"
-			value="0" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
-			value="false" />
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression"
-			value="80" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation"
-			value="2" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package"
-			value="0" />
-		<setting id="org.eclipse.jdt.core.compiler.source" value="1.7" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.align_type_members_on_columns"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration"
-			value="0" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.indentation.size"
-			value="8" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.enabling_tag"
-			value="@formatter:on" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration"
-			value="16" />
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment"
-			value="0" />
-		<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier"
-			value="error" />
-		<setting id="org.eclipse.jdt.core.formatter.tabulation.char"
-			value="space" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body"
-			value="true" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration"
-			value="0" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier"
-			value="error" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
-			value="false" />
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration"
-			value="end_of_line" />
-		<setting id="org.eclipse.jdt.core.formatter.compact_else_if"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.tabulation.size"
-			value="2" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer"
-			value="2" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode"
-			value="enabled" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line"
-			value="true" />
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments"
-			value="true" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.line_length"
-			value="80" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
-			value="0" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration"
-			value="16" />
-		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_html"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration"
-			value="16" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
-			value="insert" />
-		<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform"
-			value="1.7" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try"
-			value="80" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
-			value="0" />
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_header"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
-			value="do not insert" />
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
-			value="0" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration"
-			value="end_of_line" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries"
-			value="true" />
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports"
-			value="1" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
-			value="true" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
-			value="insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
-			value="do not insert" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
-			value="false" />
-		<setting
-			id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
-			value="false" />
-	</profile>
+  <profile kind="CodeFormatterProfile" name="samoa" version="1">
+    <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0" />
+    <setting id="org.eclipse.jdt.core.compiler.source" value="1.7" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0" />
+    <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error" />
+    <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
+      value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
+      value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert" />
+    <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7" />
+    <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
+      value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
+      value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert" />
+    <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80" />
+    <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
+      value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert" />
+    <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
+      value="do not insert" />
+    <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false" />
+    <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false" />
+  </profile>
 </profiles>
diff --git a/samoa-api/pom.xml b/samoa-api/pom.xml
index c9e41fc..aae6824 100644
--- a/samoa-api/pom.xml
+++ b/samoa-api/pom.xml
@@ -1,127 +1,114 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <name>samoa-api</name>
-    <description>API and algorithms for SAMOA</description>
+  <name>samoa-api</name>
+  <description>API and algorithms for SAMOA</description>
 
-    <artifactId>samoa-api</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
+  <artifactId>samoa-api</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>${metrics-core.version}</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.yammer.metrics</groupId>
+      <artifactId>metrics-core</artifactId>
+      <version>${metrics-core.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-            <version>${jcip-annotations.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <version>${jcip-annotations.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons-lang3.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.github.javacliparser</groupId>
-            <artifactId>javacliparser</artifactId>
-            <version>${javacliparser.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>com.github.javacliparser</groupId>
+      <artifactId>javacliparser</artifactId>
+      <version>${javacliparser.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-instances</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-instances</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.esotericsoftware.kryo</groupId>
-            <artifactId>kryo</artifactId>
-            <version>${kryo.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.dreizak</groupId>
-            <artifactId>miniball</artifactId>
-            <version>${miniball.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>com.esotericsoftware.kryo</groupId>
+      <artifactId>kryo</artifactId>
+      <version>${kryo.version}</version>
+    </dependency>
 
-	<dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-common</artifactId>
-                <version>${hadoop.version}</version>
-        </dependency>
-        <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-hdfs</artifactId>
-                <version>${hadoop.version}</version>
-        </dependency>
-        <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-minicluster</artifactId>
-                <version>${hadoop.version}</version>
-                <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>com.dreizak</groupId>
+      <artifactId>miniball</artifactId>
+      <version>${miniball.version}</version>
+    </dependency>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>${maven-dependency-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-minicluster</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>false</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samoa-instances/pom.xml b/samoa-instances/pom.xml
index 98d2ebf..59a9d8b 100644
--- a/samoa-instances/pom.xml
+++ b/samoa-instances/pom.xml
@@ -1,35 +1,22 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <name>samoa-instances</name>
-    <description>Instances for SAMOA</description>
+  <name>samoa-instances</name>
+  <description>Instances for SAMOA</description>
 
-    <artifactId>samoa-instances</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
+  <artifactId>samoa-instances</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 </project>
diff --git a/samoa-local/pom.xml b/samoa-local/pom.xml
index b36a2c8..5a0606a 100644
--- a/samoa-local/pom.xml
+++ b/samoa-local/pom.xml
@@ -1,101 +1,88 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  <name>samoa-local</name>
+  <description>Simple local engine for SAMOA</description>
+  <artifactId>samoa-local</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-test</artifactId>
+      <type>test-jar</type>
+      <classifier>test-jar-with-dependencies</classifier>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j-simple.version}</version>
+    </dependency>
+  </dependencies>
 
-    <name>samoa-local</name>
-    <description>Simple local engine for SAMOA</description>
-    <artifactId>samoa-local</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-test</artifactId>
-            <type>test-jar</type>
-            <classifier>test-jar-with-dependencies</classifier>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-simple.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- SAMOA assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <finalName>SAMOA-Local-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <attach>false</attach>
-                    <outputDirectory>../target</outputDirectory>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
-                            <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>-Xmx1G</argLine>
-                    <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <!-- SAMOA assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+          <finalName>SAMOA-Local-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <attach>false</attach>
+          <outputDirectory>../target</outputDirectory>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
+              <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <argLine>-Xmx1G</argLine>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samoa-local/src/main/resources/log4j.xml b/samoa-local/src/main/resources/log4j.xml
index cb40dec..ac00072 100644
--- a/samoa-local/src/main/resources/log4j.xml
+++ b/samoa-local/src/main/resources/log4j.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 - 2014 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
+<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); 
+  you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
 
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration debug="false">
-  
+
   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n"/>
-     </layout>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n" />
+    </layout>
   </appender>
-  
+
   <root>
     <priority value="info" />
-    <appender-ref ref="CONSOLE"/>
+    <appender-ref ref="CONSOLE" />
   </root>
 </log4j:configuration>
diff --git a/samoa-s4/pom.xml b/samoa-s4/pom.xml
index b530d44..7ce5514 100644
--- a/samoa-s4/pom.xml
+++ b/samoa-s4/pom.xml
@@ -1,135 +1,121 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <name>samoa-s4</name>
-    <description>S4 bindings for SAMOA</description>
+  <name>samoa-s4</name>
+  <description>S4 bindings for SAMOA</description>
 
-    <artifactId>samoa-s4</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
+  <artifactId>samoa-s4</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.github.javacliparser</groupId>
-            <artifactId>javacliparser</artifactId>
-            <version>${javacliparser.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>com.github.javacliparser</groupId>
+      <artifactId>javacliparser</artifactId>
+      <version>${javacliparser.version}</version>
+    </dependency>
 
-        <!-- S4 dependencies need to be installed separately as they are 
-            not available via Maven yet -->
-        <dependency>
-            <groupId>org.apache.s4</groupId>
-            <artifactId>s4-base</artifactId>
-            <version>${s4.version}</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- S4 dependencies need to be installed separately as they are not available via Maven yet -->
+    <dependency>
+      <groupId>org.apache.s4</groupId>
+      <artifactId>s4-base</artifactId>
+      <version>${s4.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.s4</groupId>
-            <artifactId>s4-comm</artifactId>
-            <version>${s4.version}</version>
-            <scope>provided</scope>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.s4</groupId>
+      <artifactId>s4-comm</artifactId>
+      <version>${s4.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.s4</groupId>
-            <artifactId>s4-core</artifactId>
-            <version>${s4.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.apache.s4</groupId>
+      <artifactId>s4-core</artifactId>
+      <version>${s4.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>${maven-dependency-plugin.version}</version>
-                <configuration>
-                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
+        <configuration>
+          <outputDirectory>${project.build.directory}/lib</outputDirectory>
+          <overWriteReleases>false</overWriteReleases>
+          <overWriteSnapshots>false</overWriteSnapshots>
+          <overWriteIfNewer>true</overWriteIfNewer>
 
-                    <excludeGroupIds>org.apache.s4</excludeGroupIds>
-                    <excludeTransitive>true</excludeTransitive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+          <excludeGroupIds>org.apache.s4</excludeGroupIds>
+          <excludeTransitive>true</excludeTransitive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-            <!-- SAMOA assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/samoa-s4.xml</descriptor>
-                    </descriptors>
-                    <finalName>SAMOA-S4-${project.version}</finalName>
-                    <attach>false</attach>
-                    <outputDirectory>../target</outputDirectory>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
-                            <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
-                            <S4-App-Class>com.yahoo.labs.samoa.topology.impl.S4DoTask</S4-App-Class>
-                            <S4-Version>${s4.version}</S4-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase> <!-- bind to the packaging phase -->
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+      <!-- SAMOA assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/samoa-s4.xml</descriptor>
+          </descriptors>
+          <finalName>SAMOA-S4-${project.version}</finalName>
+          <attach>false</attach>
+          <outputDirectory>../target</outputDirectory>
+          <appendAssemblyId>false</appendAssemblyId>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
+              <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
+              <S4-App-Class>com.yahoo.labs.samoa.topology.impl.S4DoTask</S4-App-Class>
+              <S4-Version>${s4.version}</S4-Version>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase> <!-- bind to the packaging phase -->
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samoa-s4/samoa-s4-adapter/pom.xml b/samoa-s4/samoa-s4-adapter/pom.xml
index 031fb8a..8f1a7cf 100644
--- a/samoa-s4/samoa-s4-adapter/pom.xml
+++ b/samoa-s4/samoa-s4-adapter/pom.xml
@@ -1,52 +1,30 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-	<!-- PARENT MODULE SAMOA-S4 
-	<parent>
-		<groupId>com.yahoo.labs.bcn.samoa</groupId>
-		<artifactId>samoa-s4</artifactId>
-		<version>0.1</version>
-	</parent>
-	-->
+  <!-- PARENT MODULE SAMOA-S4 <parent> <groupId>com.yahoo.labs.bcn.samoa</groupId> <artifactId>samoa-s4</artifactId> <version>0.1</version> 
+    </parent> -->
 
-	<!-- SAMOA-S4-ADAPTER MODUEL -->
-	<artifactId>samoa-s4-adapter</artifactId>
-	<groupId>com.yahoo.labs.bcn.samoa</groupId>
-	<version>0.1</version>
-	<name>samoa-s4-adapter</name>
-	<description>Adapter module to connect to external stream and also to provide entrance processing items for SAMOA</description>
+  <!-- SAMOA-S4-ADAPTER MODUEL -->
+  <artifactId>samoa-s4-adapter</artifactId>
+  <groupId>com.yahoo.labs.bcn.samoa</groupId>
+  <version>0.1</version>
+  <name>samoa-s4-adapter</name>
+  <description>Adapter module to connect to external stream and also to provide entrance processing items for SAMOA</description>
 
-	<dependencies>
-		<!-- dependency>
-			<artifactId>samoa-api</artifactId>
-			<groupId>com.yahoo.labs.bcn.samoa</groupId>
-			<version>0.1</version>
-		</dependency> -->
-		<dependency>
-			<artifactId>samoa-s4</artifactId>
-			<groupId>com.yahoo.labs.bcn.samoa</groupId>
-			<version>0.1</version>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <!-- dependency> <artifactId>samoa-api</artifactId> <groupId>com.yahoo.labs.bcn.samoa</groupId> <version>0.1</version> 
+      </dependency> -->
+    <dependency>
+      <artifactId>samoa-s4</artifactId>
+      <groupId>com.yahoo.labs.bcn.samoa</groupId>
+      <version>0.1</version>
+    </dependency>
+  </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/samoa-s4/src/main/assembly/samoa-s4.xml b/samoa-s4/src/main/assembly/samoa-s4.xml
index 8e5614a..e0acd0e 100644
--- a/samoa-s4/src/main/assembly/samoa-s4.xml
+++ b/samoa-s4/src/main/assembly/samoa-s4.xml
@@ -1,64 +1,48 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>dist</id>
-	<formats>
-		<format>jar</format>
-	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>dist</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
 
-	<fileSets>
-		<!-- SAMOA API artifacts -->
-		<fileSet>
-			<outputDirectory>lib/</outputDirectory>
-			<directory>../samoa-api/target/lib/</directory>
-			<includes>
-				<include>*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<outputDirectory>app/</outputDirectory>
-			<directory>../samoa-api/target/</directory>
-			<includes>
-				<include>samoa-api-*.jar</include>
-			</includes>
-		</fileSet>
-		
-		<!-- SAMOA S4 artifacts -->
-		<fileSet>
-			<outputDirectory>app/</outputDirectory>
-			<directory>target/</directory>
-			<includes>
-				<include>samoa-s4-*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<outputDirectory>/</outputDirectory>
-			<directory>target/</directory>
-			<includes>
-				<include>lib/*</include>
-			</includes>
-		</fileSet>
-	</fileSets>
+  <fileSets>
+    <!-- SAMOA API artifacts -->
+    <fileSet>
+      <outputDirectory>lib/</outputDirectory>
+      <directory>../samoa-api/target/lib/</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>app/</outputDirectory>
+      <directory>../samoa-api/target/</directory>
+      <includes>
+        <include>samoa-api-*.jar</include>
+      </includes>
+    </fileSet>
+
+    <!-- SAMOA S4 artifacts -->
+    <fileSet>
+      <outputDirectory>app/</outputDirectory>
+      <directory>target/</directory>
+      <includes>
+        <include>samoa-s4-*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/</outputDirectory>
+      <directory>target/</directory>
+      <includes>
+        <include>lib/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
 
 </assembly>
\ No newline at end of file
diff --git a/samoa-samza/pom.xml b/samoa-samza/pom.xml
index 8fd60a7..ffbdc7e 100644
--- a/samoa-samza/pom.xml
+++ b/samoa-samza/pom.xml
@@ -1,168 +1,142 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  <name>samoa-samza</name>
+  <description>Samza engine for SAMOA</description>
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <artifactId>samoa-samza</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-    <name>samoa-samza</name>
-    <description>Samza engine for SAMOA</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-    <artifactId>samoa-samza</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-log4j12.version}</version>
+    </dependency>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <!--<dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>11.0.2</version> </dependency> -->
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-log4j12.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.samza</groupId>
+      <artifactId>samza-api</artifactId>
+      <version>${samza.version}</version>
+    </dependency>
 
-        <!--<dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>11.0.2</version>
-        </dependency> -->
+    <dependency>
+      <groupId>org.apache.samza</groupId>
+      <artifactId>samza-core_2.10</artifactId>
+      <version>${samza.version}</version>
+    </dependency>
 
-        <dependency>
-        	<groupId>org.apache.samza</groupId>
-        	<artifactId>samza-api</artifactId>
-        	<version>${samza.version}</version>
-      	</dependency>
-      	
-      	<dependency>
-        	<groupId>org.apache.samza</groupId>
-        	<artifactId>samza-core_2.10</artifactId>
-        	<version>${samza.version}</version>
-      	</dependency>
-      
-      	<dependency>
-        	<groupId>org.apache.samza</groupId>
-        	<artifactId>samza-serializers_2.10</artifactId>
-        	<version>${samza.version}</version>
-      	</dependency>
-      
-      	<!--<dependency>
-        	<groupId>org.apache.samza</groupId>
-        	<artifactId>samza-shell</artifactId>
-       	 	<classifier>dist</classifier>
-        	<type>tgz</type>
-        	<version>${samza.version}</version>
-      	</dependency>-->
-      
-      	<dependency>
-        	<groupId>org.apache.samza</groupId>
-        	<artifactId>samza-yarn_2.10</artifactId>
-        	<version>${samza.version}</version>
-      	</dependency>
+    <dependency>
+      <groupId>org.apache.samza</groupId>
+      <artifactId>samza-serializers_2.10</artifactId>
+      <version>${samza.version}</version>
+    </dependency>
 
-	<dependency>
-                <groupId>org.apache.samza</groupId>
-                <artifactId>samza-kafka_2.10</artifactId>
-                <version>${samza.version}</version>
-        </dependency>
+    <!--<dependency> <groupId>org.apache.samza</groupId> <artifactId>samza-shell</artifactId> <classifier>dist</classifier> 
+      <type>tgz</type> <version>${samza.version}</version> </dependency> -->
 
-	<dependency>
-                <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka_2.10</artifactId>
-                <version>${kafka.version}</version>
-        </dependency>
-	<dependency>
-		<groupId>com.101tec</groupId>
-		<artifactId>zkclient</artifactId>
-		<version>0.4</version>
-	</dependency>
-	<dependency>
-		<groupId>commons-io</groupId>
-		<artifactId>commons-io</artifactId>
-		<version>2.1</version>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.hadoop</groupId>
-		<artifactId>hadoop-common</artifactId>
-		<version>${hadoop.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.hadoop</groupId>
-		<artifactId>hadoop-hdfs</artifactId>
-		<version>${hadoop.version}</version> 
-	</dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.apache.samza</groupId>
+      <artifactId>samza-yarn_2.10</artifactId>
+      <version>${samza.version}</version>
+    </dependency>
 
-    <build>
-        <plugins>
-            <!-- SAMOA assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    
-                    <descriptors>
-                        <descriptor>src/main/assembly/samoa-samza.xml</descriptor>
-                    </descriptors>
-                    <finalName>SAMOA-Samza-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <attach>false</attach>
-                    <outputDirectory>../target</outputDirectory>
-                    <!--
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    -->
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
-                            <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-       	<resources>
-            <resource>
-               <directory>src/main/resources</directory>
-               <filtering>true</filtering>
-            </resource>
-        </resources> 
-    </build>
+    <dependency>
+      <groupId>org.apache.samza</groupId>
+      <artifactId>samza-kafka_2.10</artifactId>
+      <version>${samza.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka_2.10</artifactId>
+      <version>${kafka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.101tec</groupId>
+      <artifactId>zkclient</artifactId>
+      <version>0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- SAMOA assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+
+          <descriptors>
+            <descriptor>src/main/assembly/samoa-samza.xml</descriptor>
+          </descriptors>
+          <finalName>SAMOA-Samza-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <attach>false</attach>
+          <outputDirectory>../target</outputDirectory>
+          <!-- <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> -->
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
+              <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
 </project>
diff --git a/samoa-samza/src/main/assembly/samoa-samza.xml b/samoa-samza/src/main/assembly/samoa-samza.xml
index ead1c0a..71961c7 100644
--- a/samoa-samza/src/main/assembly/samoa-samza.xml
+++ b/samoa-samza/src/main/assembly/samoa-samza.xml
@@ -1,38 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 - 2014 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
+<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); 
+  you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
 
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file 
+  distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under 
+  the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may 
+  obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to 
+  in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
+  ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under 
+  the License. -->
 
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>dist</id>
   <formats>
@@ -66,16 +47,8 @@
     </file>
   </files>
   <dependencySets>
-    <!--
-    <dependencySet>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>org.apache.samza:samza-shell:tgz:dist:*</include>
-      </includes>
-      <fileMode>0744</fileMode>
-      <unpack>true</unpack>
-    </dependencySet>
-    -->
+    <!-- <dependencySet> <outputDirectory>bin</outputDirectory> <includes> <include>org.apache.samza:samza-shell:tgz:dist:*</include> 
+      </includes> <fileMode>0744</fileMode> <unpack>true</unpack> </dependencySet> -->
     <dependencySet>
       <unpack>true</unpack>
       <includes>
diff --git a/samoa-samza/src/main/resources/log4j.xml b/samoa-samza/src/main/resources/log4j.xml
index 86451cf..e41fdf8 100644
--- a/samoa-samza/src/main/resources/log4j.xml
+++ b/samoa-samza/src/main/resources/log4j.xml
@@ -1,69 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 - 2014 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
+<!-- #%L SAMOA %% Copyright (C) 2013 - 2014 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); 
+  you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
 
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file 
+  distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under 
+  the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may 
+  obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to 
+  in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
+  ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under 
+  the License. -->
 
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  
+
   <appender name="RollingAppender" class="org.apache.log4j.DailyRollingFileAppender">
-     <param name="File" value="${samza.log.dir}/${samza.container.name}.log" />
-     <param name="DatePattern" value="'.'yyyy-MM-dd" />
-     <layout class="org.apache.log4j.PatternLayout">
+    <param name="File" value="${samza.log.dir}/${samza.container.name}.log" />
+    <param name="DatePattern" value="'.'yyyy-MM-dd" />
+    <layout class="org.apache.log4j.PatternLayout">
       <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n" />
-     </layout>
+    </layout>
   </appender>
-  
+
   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n"/>
-     </layout>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %-5p %c (%F:%L) - %m%n" />
+    </layout>
   </appender>
 
   <category name="com.yahoo.labs" additivity="false">
-     <priority value="info"/>
-     <appender-ref ref="CONSOLE"/>
+    <priority value="info" />
+    <appender-ref ref="CONSOLE" />
   </category>
-  
+
   <root>
     <priority value="info" />
-    <appender-ref ref="RollingAppender"/>
+    <appender-ref ref="RollingAppender" />
   </root>
 </log4j:configuration>
diff --git a/samoa-storm/pom.xml b/samoa-storm/pom.xml
index 7929593..b7e93ba 100644
--- a/samoa-storm/pom.xml
+++ b/samoa-storm/pom.xml
@@ -1,123 +1,110 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  <name>samoa-storm</name>
+  <description>Storm bindings for SAMOA</description>
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <artifactId>samoa-storm</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-    <name>samoa-storm</name>
-    <description>Storm bindings for SAMOA</description>
+  <repositories>
+    <repository> <!-- repository for Storm -->
+      <id>clojars</id>
+      <url>http://clojars.org/repo/</url>
+    </repository>
+  </repositories>
 
-    <artifactId>samoa-storm</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-test</artifactId>
+      <type>test-jar</type>
+      <classifier>test-jar-with-dependencies</classifier>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
 
-    <repositories>
-        <repository> <!-- repository for Storm -->
-            <id>clojars</id>
-            <url>http://clojars.org/repo/</url>
-        </repository>
-    </repositories>
+    <dependency>
+      <groupId>storm</groupId>
+      <artifactId>storm</artifactId>
+      <version>${storm.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>${zookeeper.storm.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-log4j12.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-test</artifactId>
-            <type>test-jar</type>
-            <classifier>test-jar-with-dependencies</classifier>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>storm</groupId>
-            <artifactId>storm</artifactId>
-            <version>${storm.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.storm.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-log4j12.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- SAMOA assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <finalName>SAMOA-Storm-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <attach>false</attach>
-                    <outputDirectory>../target</outputDirectory>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
-                            <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>-Xmx1G</argLine>
-                    <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <!-- SAMOA assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+          <finalName>SAMOA-Storm-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <attach>false</attach>
+          <outputDirectory>../target</outputDirectory>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
+              <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <argLine>-Xmx1G</argLine>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samoa-test/pom.xml b/samoa-test/pom.xml
index 2ee103b..994d35d 100644
--- a/samoa-test/pom.xml
+++ b/samoa-test/pom.xml
@@ -1,65 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>samoa</artifactId>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>samoa</artifactId>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>samoa-test</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-csv</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/test-jar-with-dependencies.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <artifactId>samoa-test</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-csv</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/test-jar-with-dependencies.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 
 </project>
\ No newline at end of file
diff --git a/samoa-test/src/main/assembly/test-jar-with-dependencies.xml b/samoa-test/src/main/assembly/test-jar-with-dependencies.xml
index 51465cc..72a83f4 100644
--- a/samoa-test/src/main/assembly/test-jar-with-dependencies.xml
+++ b/samoa-test/src/main/assembly/test-jar-with-dependencies.xml
@@ -1,19 +1,18 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>test-jar-with-dependencies</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <!-- we're creating the test-jar as an attachement -->
-            <useProjectAttachments>true</useProjectAttachments>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <unpack>true</unpack>
-        </dependencySet>
-    </dependencySets>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>test-jar-with-dependencies</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <!-- we're creating the test-jar as an attachement -->
+      <useProjectAttachments>true</useProjectAttachments>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <unpack>true</unpack>
+    </dependencySet>
+  </dependencySets>
 </assembly>
\ No newline at end of file
diff --git a/samoa-threads/pom.xml b/samoa-threads/pom.xml
index c4a6fb4..630017f 100644
--- a/samoa-threads/pom.xml
+++ b/samoa-threads/pom.xml
@@ -1,112 +1,99 @@
-<!--
-  #%L
-  SAMOA
-  %%
-  Copyright (C) 2013 Yahoo! Inc.
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+<!-- #%L SAMOA %% Copyright (C) 2013 Yahoo! Inc. %% Licensed under the Apache License, Version 2.0 (the "License"); you may 
+  not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS 
+  IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. #L% -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  <name>samoa-threads</name>
+  <description>Multithreading local engine for SAMOA</description>
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <artifactId>samoa-threads</artifactId>
+  <parent>
+    <groupId>com.yahoo.labs.samoa</groupId>
+    <artifactId>samoa</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+  </parent>
 
-    <name>samoa-threads</name>
-    <description>Multithreading local engine for SAMOA</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-api</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.labs.samoa</groupId>
+      <artifactId>samoa-test</artifactId>
+      <type>test-jar</type>
+      <classifier>test-jar-with-dependencies</classifier>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j-simple.version}</version>
+    </dependency>
+  </dependencies>
 
-    <artifactId>samoa-threads</artifactId>
-    <parent>
-        <groupId>com.yahoo.labs.samoa</groupId>
-        <artifactId>samoa</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-api</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.labs.samoa</groupId>
-            <artifactId>samoa-test</artifactId>
-            <type>test-jar</type>
-            <classifier>test-jar-with-dependencies</classifier>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-simple.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- SAMOA assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <finalName>SAMOA-Threads-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <attach>false</attach>
-                    <outputDirectory>../target</outputDirectory>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
-                            <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <argLine>-Xmx1G</argLine>
-                    <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <!-- SAMOA assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+          <finalName>SAMOA-Threads-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <attach>false</attach>
+          <outputDirectory>../target</outputDirectory>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Implementation-Vendor>Yahoo Labs</Implementation-Vendor>
+              <Implementation-Vendor-Id>SAMOA</Implementation-Vendor-Id>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <argLine>-Xmx1G</argLine>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>