Minor edits and wrapping semantically for git