Added supervision reminder and code refactoring