More consistent capitalization
Use standard logging module for output

Also, more unittest coverage.