Minor code re-structuring and commentaries fixes to improve readability.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>