v0.11.6 - minor cleanup of source