Unified use of loggers
Corrected error messages
Renamed methods for clarity
Fixed another stale stored value case