Some style CleanUp