Some more formatting and cleaning