smoothing some things out. cosmetic changes