continue Code Cleanup #1