continue Code Cleanup #2