Cleaned up code. Feel better about it now. :)