Cleaned up some code

Change-Id: I485d83b9186c0616cbf88fa16880120412c5e504