Cleanup to prepare pull request