Better variable naming and formatting