Refactor Flash of Light Librams fix