cleanup, const, references