Code Cleaning und Namespace Refactoring