cleaning up main js and testjs