Moved constructor to the top