[CHORE] Working on formatting