this update is meant to be just a code styling and optimization.