Cleaned up config file handling