#45: condensed some stuff