Reformatting code, fix lint