fixing category parse, minor hlint changes