cleaning up interface a bit