Lets clean this up a little, it bugs me

Change-Id: Id69efe0078618634bc9e591ed1eea1a1b2bde805