Changing names, fixing style, etc.