Minor refactor + comments for questions