Fixing a few things Code Climate was complaining about