Cleanup, const correctness