Kleines Refactoring & Alignment