SDPIII-51 refactoring code