Use new hash syntax, code formatting