cleaned up main .js and clientGrid