hlint code refactor