Fix lint warnings, aka follow code style