Modified the source file for increased readability.
Fixed fast-forward merge issue.