Polished pull request as requested

Fixed formatting and removed a left over commented echo