Formatting and method name change for consistency