Revert assignations alignment

Fix a few missed code style problems