trivial performance related improvements