resolves issue #19; general clean up