minor stuff

done some code cleanup