code cleanup - 1.9.3+ hash syntax, spacing, alignment