refactor things for cleanliness and prosperity