Some CleanCode-Changes