Moved constructor into initialize method