names changed

made it more organized