Some code clean-up, added comments.