Cleaned up config, moved init to top