Slightly cleaned up.

Slightly cleaned up code.