Improving testability and still looking to simplify