AP comments and refactoring

Change-Id: Iaf62fa391cd08582458ea251e7afe1fa33616e2c
Signed-off-by: Andrey Shamis <lolnik@gmail.com>