Idiom

I think this will make the code more DRY. What are your thoughts?