cleaning up what I have so far