Cleaned up code formatting from pull request #222