cleanup: non functional changes (2)