moved methods outside of class