cleaned code and last strings changes