Cleanup, using constants