Very minor refactor + comments