cleanup: introduce [Std]