Updated language
Fixed refractor