Even more hlint fixups
Clean up modules a little