Cleaned up a bit o' redundant code.