#JC-1400 Small refactoring on sape