cleanup: non functional changes