Renamed variable and method more appropriately.
Fixed imports and formatting.