Notes on further implementation and cleanup