Refactored composite lense in not so FP-core way