improve CodeClimate score by unifying the handlers
Merge pull request #8 from theckman/improve_codeclimate

improve CodeClimate score by unifying the handlers