Small fixes

Cleaned up code removed "that" and use proxy with this, set up localized
language.