Tiny refactorings

While scanning the code I found some possible improvements.

WDYT?
wow! now it's cristal clear @jodosha =)