General clean up

* alignment, spacing, make it pretty
Merge pull request #348 from ophrescue/general-clean-up

General clean up.