Minor changes/comments/refactoring