E1S7: small tweaks I feel like committing. Me lazysta