Formatting and cleanup, mainly comparison