reorg and some styling