Yay code cleanup!
Also officially update to 1.5.2