cleaning up the interface a little bit