Style and workflow improvement