Cleaned up Config stuff