++refactor, comments

Change-Id: I4fdf20bedc5b15aaec06d9ba09ce71f8ddf547ad