Minor refactoring.
Removed needless echo() call.