continue Code Cleanup #3