Code-Cleanup + Changed a few Messages