Code Cleanup and Basic Health Implementation