vice-versa status handling.
Refactoring and cleanup.