Move __construct to top