Stick to the correct formatting, finally