Cleaned up config file management options