Tidy and fix lint errors