Added some minor cleanups