Mods for my liking

Change-Id: I762e5b0877c7d3af8b36a0bad93930ddc3693370