extract constants

Change-Id: I475c21e2f68568c8546186956229c8a8139bc895