simplify code path
simplify code path

pombredanne/lsh-hdc,pombredanne/lsh-hdc,pombredanne/lsh-hdc,escherba/lsh-hdc,escherba/lsh-hdc,escherba/lsh-hdc,pombredanne/lsh-hdc,escherba/lsh-hdc,pombredanne/lsh-hdc,escherba/lsh-hdc