Code cleanup + self review