Refactor to not use scenic gem