Cleanup, naming.