improved naming and formatting