Refactor to . and add spec