Cleanup and more const