cleanup
cleanup 2
slight refactoring, now to try sub pub method to monitor changes in the values