Improving code/testability