Small cleanups in the code