Cleaned up additional comments and messages.