Clean-up of comments, spacing, etc.
Clean-up of comments, spacing, etc.