Code cleanup complete