PLA-111 add some comments
PLA-111 remove, rename, cleanup
PLA-111 update comments