CleanUp and Added general topics