Felt like re-factoring a tiny bit.