Code ceanup