random cleanup that could have been pulled out. meh.