improved class coupling