major revamp, streamlining code and removing extraneous scripts