Some things, removing magic strings,  also changing names for having it in english and spanish