UK: code refactor