refactoring and 1.9 hash syntax