#JC-1254 Small refactoring of SAPE