Tidy up and integration of Jeditable