cleaning up, fixing js