Slight refactor

Recatored select all a bit