Fix-120 Code Clean up