fix lint errors
fix lint errors and some bad styling