Fix #9 resolve foodcritic issues