Some refactoring following tips of @thoughtbot guys