Rename to avoid confusion with the interface
Reformat code and organise imports