style changes
shuffle items around a bit
code styles