Code Cleanup - Don't repeat yourself
More tests (already passing)
Code Cleanup - Don't repeat yourself