s: make code more clear