Tidy up: removing unnecessary cruft.
Make warning longer.
Merge pull request #2 from pingortle/Tidy

Tidy up.