Cleaning up indentation, whitespace