Worked on the comments mentioned in the PR, refactored a bit of the selection code or moving to a mark