Added code folding and removed trailing white-space