fixing indentation, removing debug lines