Some comments added - more to come
Some code cleanup/comments