Added pure readings values, cleanup