simplify
Further simplififcation
more simple
Refactor
Test cleanup
Cleanup