Clean up white spaces and correct indentation