Clean up __construct()