Comments and a bit of cleanups