Minor code changes, just optic