removed redundant translations; minor refactoring