Fix lint error, warnings and some bad styling