Separating things out for cleanliness