Update to reflect changes in strategy
Unnecessary braces
Cleanup, more readable, less repetition