Cleanup of check, action and report method use