new hash syntax and cleanup