Refactor - Remove hlint warnings