Fix hlint recommendations