Fix lint issues

Also some formatting fixes