#273 codestyle improvements