Minor simplifications + perlifications