Cleaned up interface callbacks a little more