made some fields private
made command factory and finder fields