Cleaned up code some.
Brendan Mc authored
c6823ac6