ticket:5 code style changes