Clean up formatting and fix lint errors