refactor - clean code, more explicit, less conditional...