Cleaned up code and comments...ready for submission.