cleanup, fix js