Review code & co

code & co