Cleaned up usage, and configure is now only called in one place