doubleshot: Refactor and cleanup