Code Cleanup -