Refactored some internal methods in augmenter