Code Clean-up