Resolve dependencies and correct foodcritic errors