s: simplify some code