Modified: Tidy of code.

Tidy of code.