Change variables from property to instance