cleaning up interface some more