lowered specificity

Made small changes to be more independent of surrounding code