Refactor + work