clean-up comment and code as per @taylorotwell