Added changes for code cleanup