Pre-refactor commenting