Sounds like a good idea. Let me refactor