Cleanup and small corrections

Change-Id: I0d8afdd3bbe34d5344738ffd3d25b12a67bf0170