[#17] multiple readability fixes