re #21 fix #21 cleaning up code and streamlining how files() returns non results