Refactor to make code a bit nicer and add verbs