Cleaned config parsing