implement hlint suggestions
get module dependencies right