Cleaned up some very repetitive code.