resolving hlint issues and minor changes