Formatting, code cleanup