Continued Clean up