refactoring to meet jabbR coding guidelines and merge user stories target in main build