improved naming/formatting