Massive changes after code-review