avoided magic numbers

Change-Id: Iedc8224570a49ac6b80c7732b8864eb0a00e24d8