cleaning up a bit the interface