cleaned up spacing in code, and comments a bit