Code cleanup effort