Just cleaning some stuff up