restyled reorganize a bit