Added factory method and changed method name to something less verbose