slight refactor or storage