issue #38: fixed code style a bit