[#18] readability fixes