CODE CLEANUP