fixed Christian's review comments