Style and comments
Sebastian's comments addressed.
Re-taking the remaining comments from Sebastian@