Better (more testeable) code.
Small changes for testing