A new day, a new refactoring of the code ¯\_(ツ)_/¯