Cleanup Pull Request #27