Misc polishing

Signed-off-by: Michael Livshin <dev@cmm.kakpryg.net>