Stylistic cleanup for kangjianbin's improvements

I haven't tested this fully myself, as I don't have a working ipop
install, but the changes are pretty simple.