cleanup, minor refactoring and commenting...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>