General clean up

* alignment, spacing, make it pretty