Improved messages. Removed redundant assignment.