WIP: cleaning up comments