user message + code cleanup (refs #6)