Try to deal with extra spaces around important key names