just some simple cleanups