cleaning up
#13