Cleanup and consistency