Clean up code org.