Simplifies because lack of tests confused me