Minor refactor + comments