Cleanups + some comments