Formatting and file cleanup