refactor to account for comments