Remove: return statements
Refactor: proper implementation of session_status()