clean up, fix up, comments

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>