Inline commenting, minor changes/alterations throughout