Refactor

## What it means

Reorganizing code to make it cleaner or easier to work with, without changing what the app does. Users should notice no difference at all.