Cleanup, especially constants