Formatting and unused file cleanup