Final minor cleanup