Reorg code a little bit