Even more code review comments added