FEATURE: loitering issue resolved.
INTERNAL: minor code re-factoring.