continue Code Cleanup #5