Code Clean-Up