Make status checking slightly more efficent