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