Cleanup, improvements