Refactor a little bit and add some ChefSpec!