Teeny refactor + comments