clean up, fixed ajax