Refactor for easier use