Full code review

Nice, thanks for doing this. Good practice :)