clean up the __construct Method