Changes Made : Code Clean up