done some janitoring