cleanup

changing some things