code cleanup with allison