Fix/cleanup private fields