Beautified implementation and comments
Deleted whitespace diffs and file mode diffs