Code tidy up

Removed problem echos and blank lines