again, just some cleanup