Cleaned up embedded spaces, tabs and statement alignment
No logic changes