Cleanup to standards