Clean up indentation, spacing, whitespace