Cleaning some stuff up a bit