Removed/Added comments.
Fixed the ordering of one-line statements, now appears after all other options exhausted.