Make origin more readable; Improved comments.