Code cleanup and update default and german strings