Rubocop Block Alignment

NEEDS REBASED AFTER #61 IS MERGED.

Enforces block alignment.

TO CR:
Check the diff and make sure the code changes look correct