cleanup + fix some align blocks
Merge pull request #16 from ohanar/align_cleanup

cleanup + fix some align blocks