Cleanup and refactoring stuff. Move diff_between to Diff class