Refactoring

* Remove unused variable.
* Split long line.