Changes for cleanup code
Changes for rename vars