optimizing old code a bit