Cleaned up code slightly.
Cleaned up code a little further.