Small cleanups + comments