#97 - BK/RA - small reason refactoring