Edify: clean up the methods and document