Removed Diff class and cleaned code #14