minor refactoring removing some duplication
minor refactoring removing some duplication

- responding to code-climate

stuzart/seek,stuzart/seek,HITS-SDBV/seek,HITS-SDBV/seek,stuzart/seek,HITS-SDBV/seek,HITS-SDBV/seek