Clean up messages and docs
Fix #166