Lewis: starting cleanup for new style of programming