Cleaned some stuff...