refactoring

applying some clean code principles

Change-Id: Id0234d76951ba4c43d86417a25de8a1279eafa6d