More CleanUp and suggestions