Simplified config file logic and improved variable names