refactoring

Code Optimation
Change of Strings (Title Bug removed)