Adds minor refactor