incorporated minor review comments
incorporated minor review comments

warriorframework/warriorframework,warriorframework/warriorframework,warriorframework/warriorframework,warriorframework/warriorframework