another cleanup

why complicated when it is easy. I will stop for today lol
just a small code cleanup

cheers

Change-Id: I3a17555fcc613c1466578758446f62b8aba0561f