Replaced tabs with spaces and corrected java doc comments