resx cleanup, code refactoring