simplify logic in the constructor

Just realized that we can get rid of some extra LOC here pretty easily and have an arguably cleaner implementation even.