LAI-1 code refactoring to include only needed extractions