Code rearange