More test friendly code. I will write some tests soon.