Alignment fixes

To make the code more readable