added styling, and minor code readability
Final edits before merge to master