Formatting, final commit