fixing indentation, removing obsolete code