working diff tool
arrange code into logical blocks