review even more code