dev_eye refactoring