Cleanup and rearange