Diff is incorrect

But made things more organized