Small code cleanups; added TODO to repository.