Made some code beautification changes and translations from German