minor cleanup before introducing additional signal