Removed reliance on hardcoded server name/comment.
General code cleanup and more descriptive variable names.