Refs #44 - Clean up title generation