Cleaned up the code a bit.

Too many methods can be a bad thing...