code cleanup and translation fixes