Monitor Code cleanup