Style improvements and unification

New hash syntax as we are >=2.0 and spacing.