just some small code cleanups