Cleaned up Config