Fixed minor quality issues.
Revert "Fixed minor quality issues."

This reverts commit 8b963764db49cf5325fa99b96d5d81e3e98245f5.