fixed lint errors and reformatting