Clean up/format code