More code cleanup and Ruby 1.9 hash syntax