A bit more cleanup of self