[#19] readability fixes