Made easier to read. Removed unnecessary echo flag