Address all hint & lint issues