cleaned up code and tested local installation