code style improvements according to hound