Cleaned up config file

Still to do data file