Attempt at more cleanup changes...