code tidy; revised dependencies; made generic app