clean up part 1
Merge pull request #4 from fisherrm/fisherrm

clean up part 1