Little bit of clean up of some public and private fields.