Refactor for easier use, added text