Integreate new hlint recommendations