Removed some magic numbers and performed minor refactorings to breakup
long statements into sequences of smaller statements.

Change-Id: I691e47dadfd1eb1f79e6ee1c8ab1d311964005fb
Signed-off-by: Jeanderson Candido <jeandersonbc@gmail.com>