Cleaned some stuff up