code cleanup #15

Change-Id: Ibd1fb918b44ccce60fbd6026959183e2d42f687b