Cleanup

* Use Ruby 1.9 hash syntax
* Remove usage of explicit self in cases that apply