Refactored operations for 1 op per file