fixing indentation, reverting usage of generics feature not available in java 1.6