Lessen redundancy a bit (based on review comments)