Cleanup to code