Update: one liner refactor ftw on line 26