objectified and revamped some code