Comments and interface cleanup: WIP