@Mofatch's first refactor. So proud.