cleaning up prob 1 even more