Full code review

Oh, sorry, I didn't want to commit this file :hushed: