Cleaned up fragment code

Change-Id: Ia9a745e5c1520a8a4eec7595c74e0c93129f07da
Signed-off-by: Rob <robert.healy3@gmail.com>