Clean up a few golint warnings
Add support for multi-line input