[~] Yet another refactoring approach