small optical system refactoring