style cleanup - it should be all unified now