Refactor disk from helpers into instance methods