Adding value prop, and some cleanup.