Refactor to reduce code replication as well as add extraction of eyes