Few more comments/cleanup