..F....... [RSM-1] minor code refactoring