Doing some review and cleanups