fixed Sascha's review comments in the code review section.