Brief refactoring

Change-Id: Id959cd8b43a30cfc16f96f79cb448a3b840c2d04