Cleaned up a crazy constructor.