Move some instance variables to properties