first attempt at cleanup