Some more style fixes

Change-Id: If1395ed6c3672c63cc6746c3da035ccb808315b2