Fixes indentation and sets align spec pending
Minor styling, naming and formatting fixes.
Makes alignment of cases optional